From e6032b12eb7beb0b31cc383d3fba550db2e8956f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 20 Mar 2002 15:59:30 +0000 Subject: [PATCH] Fix assignment of time in scroll events. (Sven Neumann, #75574) Wed Mar 20 10:55:56 2002 Owen Taylor * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment of time in scroll events. (Sven Neumann, #75574) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkevents-x11.c | 2 +- 7 files changed, 31 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 632697786b..877f0ab19b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 20 10:55:56 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment + of time in scroll events. (Sven Neumann, #75574) + 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 632697786b..877f0ab19b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Mar 20 10:55:56 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment + of time in scroll events. (Sven Neumann, #75574) + 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 632697786b..877f0ab19b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Mar 20 10:55:56 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment + of time in scroll events. (Sven Neumann, #75574) + 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 632697786b..877f0ab19b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Mar 20 10:55:56 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment + of time in scroll events. (Sven Neumann, #75574) + 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 632697786b..877f0ab19b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Mar 20 10:55:56 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment + of time in scroll events. (Sven Neumann, #75574) + 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 632697786b..877f0ab19b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Mar 20 10:55:56 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): Fix assignment + of time in scroll events. (Sven Neumann, #75574) + 2002-03-20 Tor Lillqvist * gdk/win32/gdkdnd-win32.c (gdk_drag_find_window): Use diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index b903cf7b79..0197c62338 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -718,7 +718,7 @@ gdk_event_translate (GdkEvent *event, event->scroll.direction = GDK_SCROLL_RIGHT; event->scroll.window = window; - event->scroll.time = xevent->xbutton.x; + event->scroll.time = xevent->xbutton.time; event->scroll.x = xevent->xbutton.x + xoffset; event->scroll.y = xevent->xbutton.y + yoffset; event->scroll.x_root = (gfloat)xevent->xbutton.x_root; -- 2.30.2